Fix mergeBranchIntoCurrentBranch for conflicted state#605
Merged
tiennou merged 1 commit intolibgit2:masterfrom Dec 18, 2016
Merged
Fix mergeBranchIntoCurrentBranch for conflicted state#605tiennou merged 1 commit intolibgit2:masterfrom
tiennou merged 1 commit intolibgit2:masterfrom
Conversation
checkout_opts passed to libgit2 missed a GIT_CHECKOUT_SAFE strategy, causing a dry run and only conflicted files being written out to the tree (losing all other non-conflicted ones).
Contributor
|
Thanks ! |
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
2 participants
Add this suggestion to a batch that can be applied as a single commit.This suggestion is invalid because no changes were made to the code.Suggestions cannot be applied while the pull request is closed.Suggestions cannot be applied while viewing a subset of changes.Only one suggestion per line can be applied in a batch.Add this suggestion to a batch that can be applied as a single commit.Applying suggestions on deleted lines is not supported.You must change the existing code in this line in order to create a valid suggestion.Outdated suggestions cannot be applied.This suggestion has been applied or marked resolved.Suggestions cannot be applied from pending reviews.Suggestions cannot be applied on multi-line comments.Suggestions cannot be applied while the pull request is queued to merge.Suggestion cannot be applied right now. Please check back later.
checkout_optspassed to libgit2 missed aGIT_CHECKOUT_SAFEstrategy, causing a dry run and only conflicted files being written out to the tree (losing all other non-conflicted ones).This is because libgit2 has a safeguard check in
git_mergecall, auto-addingGIT_CHECKOUT_SAFEwhen nocheckout_optswhere specified, but since the Objective-Git code specifiedGIT_CHECKOUT_ALLOW_CONFLICTSflag, it wasn't applied, causing the behaviour outlined above:checkout_strategy = given_checkout_opts ? given_checkout_opts->checkout_strategy : GIT_CHECKOUT_SAFE;